Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 16:21:14 +0000 (09:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 16:21:14 +0000 (09:21 -0700)
commitad5a94830aefa83fdeb161a9461e812acc5bfe28
tree06348e02c4079a4ea7e2061cf975b16e512331ee
parenta127aab86c09ec8bfa3fc7a8c548fe671c69267e
parentef449bd242cf9a6ef630eccad1d2ec12beb938cf
Merge from trunk.